(ange-ftp-normal-login): If using a smart gateway,

but ange-ftp-gateway-host is nil, generate the login name
in the usual simple way.

diff --git a/lisp/ange-ftp.el b/lisp/ange-ftp.el
index 2e4d01934966b1242df15f48c6d5c9c086a2a32c..2778e859ccb1e893a0fd558cd78f7bd257ca8618 100644 (file)
--- a/lisp/ange-ftp.el
+++ b/lisp/ange-ftp.el
@@ -1926,7 +1926,8 @@ PROC is the process to the FTP-client."
                                (cdr result))))
     (setq result (ange-ftp-raw-send-cmd
                  proc
-                 (if (ange-ftp-use-smart-gateway-p host)
+                 (if (and (ange-ftp-use-smart-gateway-p host)
+                          ange-ftp-gateway-host)
                      (format "user \"%s\"@%s %s %s" user nshost pass account)
                    (format "user \"%s\" %s %s" user pass account))
                  (format "Logging in as user %s@%s" user host)))